autorun: use GError.matches() to fix some FIXMEs

Discard FAILED_HANDLED errors, now that we can detect them from JS.

https://bugzilla.gnome.org/show_bug.cgi?id=674962

diff --git a/js/ui/automountManager.js b/js/ui/automountManager.js
index d6cc3b76fae1a2b855aece35f8a871685a83f842..12ba99ce5432d774cbcd783a17c72bd77f2fd845 100644 (file)
--- a/js/ui/automountManager.js
+++ b/js/ui/automountManager.js
@@ -268,7 +268,9 @@ const AutomountManager = new Lang.Class({
             if (e.message.indexOf('No key available with this passphrase') != -1) {
                 this._reaskPassword(volume);
             } else {
-                log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                    log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
+
                 this._closeOperation(volume);
             }
         }

diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
index be4eba2687c80007e2919a79da67123dce2e5c6e..099573bb9c3cd43bea9e07d54dc200d2e974bdba 100644 (file)
--- a/js/ui/autorunManager.js
+++ b/js/ui/autorunManager.js
@@ -226,11 +226,9 @@ const AutorunManager = new Lang.Class({
         try {
             mount.unmount_with_operation_finish(res);
         } catch (e) {
-            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
-            // but we can't access the error code from JS.
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
-            log('Unable to eject the mount ' + mount.get_name() 
-                + ': ' + e.toString());
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                log('Unable to eject the mount ' + mount.get_name() 
+                    + ': ' + e.toString());
         }
     },
 
@@ -238,11 +236,9 @@ const AutorunManager = new Lang.Class({
         try {
             source.eject_with_operation_finish(res);
         } catch (e) {
-            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
-            // but we can't access the error code from JS.
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
-            log('Unable to eject the drive ' + source.get_name() 
-                + ': ' + e.toString());
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                log('Unable to eject the drive ' + source.get_name()
+                    + ': ' + e.toString());
         }
     },
 
@@ -250,11 +246,9 @@ const AutorunManager = new Lang.Class({
         try {
             drive.stop_finish(res);
         } catch (e) {
-            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
-            // but we can't access the error code from JS.
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
-            log('Unable to stop the drive ' + drive.get_name() 
-                + ': ' + e.toString());
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                log('Unable to stop the drive ' + drive.get_name() 
+                    + ': ' + e.toString());
         }
     },
 });